From 1b3f9df361ac473cf7eb304002c4a36127317ead Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 21 Jun 2013 08:55:55 -0400 Subject: [PATCH] Remove rest of gtk-show-input-method-menu and gtk-show-unicode-menu They are no longer used. --- gdk/wayland/gdkscreen-wayland.c | 2 -- gdk/win32/gdkproperty-win32.c | 2 -- gtk/gtkimcontext.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c index c7a0fe3611..49f6638378 100644 --- a/gdk/wayland/gdkscreen-wayland.c +++ b/gdk/wayland/gdkscreen-wayland.c @@ -485,8 +485,6 @@ static TranslationEntry translations[] = { { "org.gnome.desktop.interface", "buttons-have-icons", "gtk-button-images", G_TYPE_BOOLEAN, { .b = FALSE } }, { "org.gnome.desktop.interface", "gtk-im-module", "gtk-im-module", G_TYPE_STRING, { .s = "simple" } }, { "org.gnome.desktop.interface", "enable-animations", "gtk-enable-animations", G_TYPE_BOOLEAN, { .b = TRUE } }, - { "org.gnome.desktop.interface", "show-input-method-menu", "gtk-show-input-method-menu", G_TYPE_BOOLEAN, { .b = FALSE } }, - { "org.gnome.desktop.interface", "show-unicode-menu", "gtk-show-unicode-menu", G_TYPE_BOOLEAN, { .b = FALSE } }, { "org.gnome.desktop.interface", "automatic-mnemonics", "gtk-auto-mnemonics", G_TYPE_BOOLEAN, { .b = TRUE } }, { "org.gnome.desktop.interface", "toolbar-style", "gtk-toolbar-style", G_TYPE_STRING, { .s = "both-horiz"} }, { "org.gnome.desktop.interface", "toolbar-icons-size", "gtk-toolbar-icon-size", G_TYPE_STRING, { .s = "large"} }, diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index e2df14d8f4..dd75203545 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -324,8 +324,6 @@ _gdk_win32_window_delete_property (GdkWindow *window, "Gtk/CursorBlinkTimeout\0" "gtk-cursor-blink-timeout\0" "Gtk/CursorThemeName\0" "gtk-cursor-theme-name\0" "Gtk/CursorThemeSize\0" "gtk-cursor-theme-size\0" - "Gtk/ShowInputMethodMenu\0" "gtk-show-input-method-menu\0" - "Gtk/ShowUnicodeMenu\0" "gtk-show-unicode-menu\0" "Gtk/TimeoutInitial\0" "gtk-timeout-initial\0" "Gtk/TimeoutRepeat\0" "gtk-timeout-repeat\0" "Gtk/ColorScheme\0" "gtk-color-scheme\0" diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index f0f351fbda..68d77e93bf 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -33,8 +33,6 @@ * is used by GTK+ text input widgets like #GtkEntry to map from key events to * Unicode character strings. * - * The user may change the current input method via a context menu, unless the - * #GtkSettings:gtk-show-input-method-menu GtkSettings property is set to FALSE. * The default input method can be set programmatically via the * #GtkSettings:gtk-im-module GtkSettings property. Alternatively, you may set * the GTK_IM_MODULE environment variable as documented in #gtk-running. -- 2.30.2